Squashed commit of the following:

commit 30e103d19519fe678ae64a60d77884ef3d71b28a
Merge: 8d82ac4 71cd475
Author: Konstantin Kudryashov <ever.zet@gmail.com>
Date:   Fri Nov 1 06:02:21 2013 -0700

    Merge pull request #2 from samdark/5.5-and-cleanup

    5.5 and cleanup

commit 71cd475aef0b1ccda2c15f5c4766a221fb71fb49
Author: Alexander Makarov <sam@rmcreative.ru>
Date:   Tue Oct 15 13:53:22 2013 +0400

    Fixed callback

commit dd80390d67c2743c8e9872781b1adbd376fb6904
Author: Alexander Makarov <sam@rmcreative.ru>
Date:   Tue Oct 15 12:53:16 2013 +0400

    phpdoc fixes

commit 29dc0029cc81193ac1e296770a9edaf7d8720857
Author: Alexander Makarov <sam@rmcreative.ru>
Date:   Tue Oct 15 12:52:58 2013 +0400

    PHP 5.5 compatibility fix

commit 8d82ac415225fac373a4073ba14b1fe286aa2312
Merge: 7efe41e 9b736ac
Author: Konstantin Kudryashov <ever.zet@gmail.com>
Date:   Thu Nov 8 00:55:45 2012 -0800

    Merge pull request #1 from RobLoach/validate-composer

    Fix composer.json so that it validates

commit 9b736ac28341f8193627aafdb9929e3e798263f9
Author: Rob Loach <robloach@gmail.com>
Date:   Wed Nov 7 16:08:40 2012 -0500

    Fix composer.json so that it validates

commit 7efe41e227eae44f3ad443905957f9081cf05e3b
Author: Konstantin Kudryashov <ever.zet@gmail.com>
Date:   Thu Sep 27 02:00:35 2012 +0300

    Update composer.json

    Change namespace as this is a fork