Version 0.1.6

Initial commit
Merge branch 'refs/heads/master' into gh-pages