Fix for #15 and #14
Merge branch '0.1_bugfixing_and_enhancements'