Merge pull request #1 from madre/master

2014-11-21 pullrequest