#M-236 Fixed
Merge pull request #562 from sydneypaige/1.1.0

#M-236 Fixed