Implement issue #4.
Merge pull request #5 from EntityReborn/master

Implement issue #4.