Fixed issue #17
Merge branch 'refs/heads/master' into development