Develop

@phildarnowsky
I have implemented the features and committed to develop branch.