saurshaz/et-core — pull request #6 by saurshaz (2013-12-22 10:12:02+00:00)
Title: Wip

Bring changes from master to WIP branch