Implemented missing features

See title.
Merge pull request #20 from Orasi/Brian_Branch

Implemented missing features