Optimization options and some bugfixes
Push version to 0.1.5