Merge Develop

Fixed #68, ready for v1.0