commit1
Merge pull request #2 from lowguy400/20140627_test

wip