Fixes

+ Fixed #105
+ Fixed #106
+ Improve builds for linux-distribution