Merge pull request #11 from phcoder/sev1

Several fixes
28 jobs for master in 9 minutes and 15 seconds (queued for 27 minutes and 24 seconds)