Changes for 0.2.16
Merge pull request #365 from varya/release/0.2.16

Changes for 0.2.16
Merge pull request #366 from SC5/dev

Changes for 0.2.16 into master