Merge pull request #1 from ltfschoen/master

Fix merge
Merge pull request #2 from ltfschoen/20140424

Fix merge