Issue7

Merge back to master