Added more functions. resolves #13, resolves #9
1.2.0
Merged