merge Daniel's Pullreq
Merge pull request #29 from HTML5ExpertsHackathon/mergeDaniel

merge Daniel's Pullreq