luke5sky Merge pull request #18 from luke5sky/development