Added 0.1.7, lots of Javadoc added and some minor code improvement