merged latest updates from bitbucket
added gemfile.lock
updated rakefile