Another robbery (of time...)
Merge pull request #268 from ThePyrotechnic/Dev

Another robbery (of time...)