Dev issue 39

merging my changes to master