Merge pull request #55 from blairprophett/master

stlying