Merge pull request #1 from ludvi025/tomdev

Looks good.