Merge pull request #39 from ahmedirfan1983/master
authorClifford Wolf <clifford@clifford.at>
Mon, 22 Sep 2014 10:37:43 +0000 (12:37 +0200)
committerClifford Wolf <clifford@clifford.at>
Mon, 22 Sep 2014 10:37:43 +0000 (12:37 +0200)
merged with current mas.ter branch + features added + bug fixes


Trivial merge