MansMeg Merge pull request #107 from MansMeg/Development