reverted to Wil's changes
Merge pull request #2 from PureHacks/mergeconflicts

reverted to Wil's changes