Merge pull request #26 from ryanttb/dev

import!