Merge branch 'master' into aluxian
Merge pull request #87 from cloudspokes/aluxian

Issues #45 and #46