timestamp as Date instead of String
removing xmlns:stub & xmlns:custom
other small formattings
reset timestamp to String
Merge pull request #1 from vp2177/master

fixing compile in IntelliJ