Merge pull request #14 from sparcians/upstream-master

Upstream latest updates
7 jobs for master
in 0 seconds and was queued for 88 minutes and 19 seconds