Merge develop branch into master

Fixed #8 and other features.