Merge pull request #28 from SupunS/master

pom updated
added few more TODO comments