added moar fun
merging dev to master version 0.1