Merge pull request #18 from ArkeologeN/v0.3.0

commit merge, 0.3.1 release and misc.