Merge pull request #348 from SC5/dev

Updating master from dev for 0.2.15