2/11/2014
fixed rubbish
Merge pull request #13 from RomeshPanditha/master

Merge back into personal fork