Commit 20140624 20:02
Merge pull request #1 from framorcor/master

Commit 20140624 20:02