Merge pull request #2 from baloctran/master

Get code