Merge pull request #193 from waartaa/devel

0.2 release