Surram/quickbits — pull request #56 by ckampfe (2013-12-05 00:16:37+00:00)
Title: fix merge conflict left in code

remove merge relic left in @ctailor2 merge