Added three more features (#25). Also added maven support and some refactoring.
Added TODO