Fixed "most vexing parse" issue.
Merge remote-tracking branch 'xethik/master'