Dev

Missing files to resolve issues #3,#4 and #5