Issue#44 Fixed a merging error in previous commits