Implemented commits made by AgentK on 12 Nov 2014
- Merged commit 8ea658303c88d31ae14244d4fe51bccad874fc2a