palladium hackathon 15 Apr 2014
Merge pull request #15 from xeno-by/master

palladium hackathon 15 Apr 2014