some changes
Merge pull request #2 from typework/wip

some changes