Fix issue #353
Fix issue #353

stevenlovegrove/Pangolin,mp3guy/Pangolin,tschmidt23/Pangolin,renzodenardi/Pangolin,stevenlovegrove/Pangolin,stevenlovegrove/Pangolin,renzodenardi/Pangolin,tschmidt23/Pangolin,mp3guy/Pangolin,mp3guy/Pangolin,tschmidt23/Pangolin