Fixing master
Working with Aptana