import of stuff
Merge pull request #1 from leechuck/master

import of Robert's stuff