Update 2

Added OSX projects and fixed some bugs. All thanks to Andy Willmott.