Merged bugfix and update npm version to 0.1.2