Merge pull request #119 from rdsubhas/master

Updated travis configuration
Fix maven errors when unit testing