Bug fix and update to version 0.1.2