Merge pull request #54 from aptana/master

Master
Merge pull request #55 from aptana/release

Merge pull request #54 from aptana/master