Merge pull request #366 from SC5/dev

Changes for 0.2.16 into master