refactored to use @properties instead of ivars + hided private stuff from header
ignore xcode shit
Merge remote-tracking branch 'origin/master'