Resolved conflicts in last commit.
Merge branch 'dev' of https://github.com/Ballista-Line/Genesis into dev