Merge pull request #15 from 6fusion/master

Merge master down to development.
Merge branch 'development'