Refactored some methods, added new ones
0.4.0