Merge pull request #5 from slamke/master

testPull20140711-2