wip
Merge pull request #1 from lowguy400/20140626_test

wip