Merge pull request #54 from aptana/master

Master